Fix mem clobber. Improve qsort comparison function. From Olaf.

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index 53723a81153cc212187e58407bf9dd1a5f267793..1f3f6e7f82f7f58d6de85defd7acd0fe74729676 100644 (file)
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -68,9 +68,7 @@ trackfilter_qsort_cb(const void *a, const void *b)
        const trkflt_t *ra = a;
        const trkflt_t *rb = b;
 
-       if (ra->first_time < rb->first_time) return -1;
-       else if (ra->first_time > rb->first_time) return +1;
-       else return 0;
+       return ra->first_time - rb->first_time;
 }
 
 /*----------------------------------------------------------------------------------------*/
@@ -299,6 +297,7 @@ trackfilter_split(void)
                wpt = waypt_dupe(buff[j]);
                route_del_wpt(master, buff[j]);
                route_add_wpt(curr, wpt);
+               buff[j] = wpt;
            }
        }